* lisp/net/ldap.el (ldap-search-internal): The official ldif format starts

with a "version: 1" header.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e21723403e627fedf98a06176778d20fa95fd04..8016ed51ed42c6483165cfb109396cc6fe22366c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-10-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * net/ldap.el (ldap-search-internal): The official ldif format starts
+       with a "version: 1" header (bug#12724).
+
        * emacs-lisp/package.el (package-installed-p): Warn if not ready
        (bug#12721).
 

diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index eb696798b6f20cc9ebd5a98560b768044366cdfe..6ef713de93d1723f3258ba30fe6776441de7628d 100644 (file)
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -604,6 +604,7 @@ an alist of attribute/value pairs."
        ;; Skip error message when retrieving attribute list
        (if (looking-at "Size limit exceeded")
            (forward-line 1))
+        (if (looking-at "version:") (forward-line 1)) ;bug#12724.
        (while (progn
                 (skip-chars-forward " \t\n")
                 (not (eobp)))